Hotfix 0.4.0.1