Fixed DateTime patching