Yet another fix of PR2172