Fix glitches 8