Fixed parser not resetting completely