Hotfix issue #3