diff --git a/Sources/PostgreSQL/Data/PostgreSQLData+Date.swift b/Sources/PostgreSQL/Data/PostgreSQLData+Date.swift
index 0b3d0890..f357ed67 100644
--- a/Sources/PostgreSQL/Data/PostgreSQLData+Date.swift
+++ b/Sources/PostgreSQL/Data/PostgreSQLData+Date.swift
@@ -24,8 +24,8 @@ extension Date: PostgreSQLDataConvertible {
             switch data.type {
             case .timestamp, .time:
                 let microseconds = try value.makeFixedWidthInteger(Int64.self)
-                let seconds = microseconds / _microsecondsPerSecond
-                return Date(timeInterval: Double(seconds), since: _psqlDateStart)
+                let seconds = Double(microseconds) / Double(_microsecondsPerSecond)
+                return Date(timeInterval: seconds, since: _psqlDateStart)
             case .date:
                 let days = try value.makeFixedWidthInteger(Int32.self)
                 let seconds = days * _secondsInDay
@@ -37,7 +37,7 @@ extension Date: PostgreSQLDataConvertible {
 
     /// See `PostgreSQLDataCustomConvertible.convertToPostgreSQLData()`
     public func convertToPostgreSQLData() throws -> PostgreSQLData {
-        return PostgreSQLData(type: .timestamp, format: .text, data: Data(description.utf8))
+        return PostgreSQLData(type: .timestamp, format: .binary, data: Int64(self.timeIntervalSince(_psqlDateStart) * Double(_microsecondsPerSecond)).data)
     }
 }