[FIX] Glitches