Fix glitches 5