Fixed weirdness