Corrected bug #2 #5