Fix weirdnessess