Fixed bugs Comments