Workaround for catkin