Fixing #139 - in progress
Fixing #139 - in progress