Fix for #2771.
Small fix adding back ToString.
Added DateTime to special cases.
Merge pull request #3175 from DynamoDS/Issue2771

Fix for #2771.