Fixing #136 - in progress