Re #1580 Fixed issue with Datetype