Fix for null DateTime?s