added upgraded for datumFields should fix #1304