Fixes CS-4709
Merge pull request #314 from terwey/CS-4709

Fixes CS-4709