Hotfix 0.7.1 beta