Added workaround for rosdistro/#3320