Fixed #638, I hope.