Should eventually see if there's a way to rework this so it's less brittle. But for now, we band-aid!