Hotfix 0.3.4