Fix glitches 11