Trying to fix glitches.