Much better baseline, as a result of the fix from previous commit