fixes #675

Oh man, I'm really glad you did this, because we already fixed this in 8.5. We would have felt stupid if it cropped up again in M13 just because we forgot to port the change over.