Hotfix issue 19

Fix #19 due to changes in #17 .