Fixes #1206.  Tested yolo style with @dnahodil.
Merge pull request #1237 from aodn/issue_1206

Fixes #1206.  Tested yolo style with @dnahodil.