[ros-diffs] [mbosma] 17213: Fix another bug thanks to GreatLord.