Tweak to fix some visual glitch