fixed some weirdness