Flip logic around to avoid concurrent modifications of list