weirdness fixed