Fixing bug #8362