Fixed infinite loop in optimistic unchoke (hopefully)