fix some parse ordering
fix another edge case