Finished version(hotfix 1)