Fixes OOIION-742
Merge pull request #979 from lukecampbell/ooiion742

Fixes OOIION-742