Issue #390 fix for failing C# tests
Merge pull request #393 from atifaziz/issue-390

Issue #390 fix for failing C# tests