bug #29 fixed