Custom parser fix