fixing bug #21