Fixes CS-4673
Merge pull request #278 from terwey/CS-4673

Fixes CS-4673