Corrected bugs