Fixing the glitches