Add polygon draw fix