Fixing bug #2803.