Corriged bugs