bug #36 fixed