Added workaround for moveit_core/#154 moveit_core/#157