Corrected Bug