[ros-dev] Bug #2397 (partially) fixed.