Complete hotfix 0.3.2