fixing bug #25