Fixes WOBS-3298
Merge pull request #715 from terwey/WOBS-3298

Fixes WOBS-3298