Fixes CS-4758
Merge pull request #4 from terwey/CS-4758

Fixes CS-4758