bug #11 fixed