Make the parser work reliably