[FIX] some glitches