Hotfix issue#2

Fix issue #2