Finally fix the cactus check