Finish Hotfix-0.4.2