Bugs Correction