fixing bug #5130