fix some weirdness