Hotfix 0.6.5