Fix some drawing glitch