Fix cactus_setup for real this time