Fixed bugs of the previous update