bug #7 fixed