Hotfix v1.0.4