Fixes #1206.  Tested yolo style with @dnahodil.

Can be merged after #1240 has been merged