Concurrency bug fix

Fixed rare leftover update() call as previous stage is being removed