fixing weirdness