fixes issue #2
Finish hotfix-2