Changed break condition on threaded draw