Bug fix with 2nd-ord partial (still not good)