fixing some weirdness.