Move to using publish_gague and fix the call check