catkin workaround