bug #25 fixing