Correct bug highlighted by 1.9 → 1.10 upgrade.