Fix for TC-2561
Merge pull request #168 from FokkeZB/TC-2561

Fix for TC-2561