Fixing issue 168.
Merge branch 'hotfix/issue168' into develop

* hotfix/issue168:
  Fixing issue 168.