Applied @dirk-thomas 's recommended fixes ( ros/ros_comm#328 )