Fixing issue where update() could fire before draw() on Mac