Fix unexpected weirdness