Fix for catkin