Test and quick fix for #1257
Merge pull request #1405 from carltongibson/#1257

Test and quick fix for #1257