fixing bug #16