Fix glitches 9