Fix yet another breakage