Fix glitches 12