Fixes CS-4672
Merge pull request #287 from terwey/CS-4672

Fixes CS-4672