Fix glitches 10