Fixes #2
Finish Hotfix-2.0.0.78