Fix glitches 3