more parser fix