More tolerant parsing