Test and fix for #1210. World's lowest hanging fruit.
Merge pull request #1406 from carltongibson/#1210

Closes #1210.