apply patch from https://code.ros.org/trac/ros-pkg/ticket/5320