Fixed the glitches.