Fix for catkin-fuckup