Fixed bugs of the new version