v0.9d Hotfix 2