Hack for CS-4678
Merge pull request #281 from terwey/CS-4678

Hack for CS-4678