attempting to fix some weirdness...