diff --git a/integration/go.mod b/integration/go.mod
index 88b2fc8..44d797b 100644
--- a/integration/go.mod
+++ b/integration/go.mod
@@ -1,4 +1,4 @@
-module github.com/taleeus/pgotask/v2integration
+module github.com/taleeus/pgotask/v2/integration
 
 go 1.23.0
 
@@ -59,7 +59,7 @@ require (
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/crypto v0.35.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 )
diff --git a/integration/go.sum b/integration/go.sum
index 135d512..b640483 100644
--- a/integration/go.sum
+++ b/integration/go.sum
@@ -137,8 +137,8 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -162,14 +162,14 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/pgotask.go b/pgotask.go
index 79e1b9c..b7a3f03 100644
--- a/pgotask.go
+++ b/pgotask.go
@@ -139,9 +139,14 @@ func (s *Scheduler) ScheduleTask(ctx context.Context, task TaskArgs) error {
 		return ErrNotRunning
 	}
 
+	var version sql.NullString
+	if s.version != "" {
+		version = sql.NullString{String: s.version, Valid: true}
+	}
+
 	if err := scheduleTask(ctx, s.db,
 		task.TaskType,
-		s.version,
+		version,
 		task.Payload,
 		task.Idempotent,
 		task.DispatchAfter,
diff --git a/queries.dispatch.go b/queries.dispatch.go
index be469b4..3daa504 100644
--- a/queries.dispatch.go
+++ b/queries.dispatch.go
@@ -58,9 +58,9 @@ func findPendingTasks(ctx context.Context, tx *sql.Tx, version sql.NullString) (
 			&task.Payload,
 			&task.CreatedAt,
 			&task.UpdatedAt,
-			&task.DispatchAfter,
 			&task.Priority,
 			&task.Retries,
+			&task.DispatchAfter,
 		); err != nil {
 			return nil, errors.Join(ErrScanRow, err)
 		}
diff --git a/queries.execution.go b/queries.execution.go
index 78aaef1..a854ba6 100644
--- a/queries.execution.go
+++ b/queries.execution.go
@@ -152,7 +152,7 @@ VALUES ($1, $2, $3, $4, $5)
 
 func scheduleTask(ctx context.Context, db *sql.DB,
 	taskType string,
-	version string,
+	version sql.NullString,
 	payload json.RawMessage,
 	idempotent bool,
 	dispatchAfter time.Duration,
@@ -162,7 +162,7 @@ func scheduleTask(ctx context.Context, db *sql.DB,
 		slog.String("query", scheduleTaskQuery),
 		slog.Duration("dispatchAfter", dispatchAfter),
 		slog.String("$1", taskType),
-		slog.String("$2", version),
+		slog.Any("$2", version),
 		slog.String("$3", string(payload)),
 		slog.Bool("$4", idempotent),
 		slog.Time("$5", dispatchTimestamp),