Fixed glitches