Fixed NoSuchElementException