Fixed the weirdness