Bugfix/issue1

Hotfix for issue 1.