Hotfix issue #73