Hotfix issue#6

Fix for issue #6