Fixes issue 11.
Fixes issue 11.

* hotfix/issue11:
  Fixes issue 11.