Fixed operator properties not being re-initialized
Improved draw() invocation logic