Hopefully this resolves the idiocy I'm fixing...