Workaround for Catkin