more faster draw
fix conflict