Fixing bug #712616