Fix glitches 13