bug #9 fixed