Fix for setting DateTimes to null