Fixed Commment bug