bug #42 fixed