changes for dattime error