Fixing bug #3404.