Fixed Nullable DateTime bug