Fixing...weirdness