Fixes #1206.  Tested yolo style with @dnahodil.