Corrected bug #1