Fixing issue #201
Merge branch 'hotfix/1.2.1'

* hotfix/1.2.1:
  Fixing issue #201