Fixed some weirdness