fixing bug #5480