fix some glitch