Fixes CS-4658
Merge pull request #286 from terwey/CS-4658

Fixes CS-4658