Fixing weirdness