Corrected bug