fixing some weirdness