Finish Hotfix-1.0.2