bug #34 fixed