Fixes  #157 - closed

Fixes #157 issue