improve parsing of OX parser