Fix parsing order