 This is continuation of the #44 but more general issue
This is continuation of the #44 but more general issue