Update to fix stop issue while drawing