Fixing issue 168.
Merge branch 'hotfix/issue168' into hotfix-1.1.1

* hotfix/issue168:
  Fixing issue 168.