Fixing #139 - in progress