Force workaround for catkin