Fix parsing rules