VINTAGE: Fixed NoSuchElementException