Fixed bugs x2