Fix weirdness