fixed weirdness