bug #1 fixed