diff --git a/catalog.go b/catalog.go
index 9b16aed..9fed1b7 100644
--- a/catalog.go
+++ b/catalog.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	internal "github.com/goccy/go-zetasqlite/internal"
+	internal "github.com/MatanLevy/go-zetasqlite/internal"
 )
 
 type (
diff --git a/cmd/zetasqlite-cli/go.mod b/cmd/zetasqlite-cli/go.mod
index fc8501c..c203e31 100644
--- a/cmd/zetasqlite-cli/go.mod
+++ b/cmd/zetasqlite-cli/go.mod
@@ -3,10 +3,11 @@ module github.com/goccy/go-zetasqlite/cmd/zetasqlite-cli
 go 1.21
 
 require (
+	github.com/MatanLevy/go-zetasqlite v0.17.10-0.20231213095134-9a693dd7e32d
 	github.com/chzyer/readline v1.5.1
 	github.com/fatih/color v1.15.0
 	github.com/goccy/go-zetasql v0.5.2
-	github.com/goccy/go-zetasqlite v0.4.0
+	github.com/goccy/go-zetasqlite v0.0.0-00010101000000-000000000000
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/olekukonko/tablewriter v0.0.5
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
diff --git a/cmd/zetasqlite-cli/go.sum b/cmd/zetasqlite-cli/go.sum
index cb3f5af..db61ad9 100644
--- a/cmd/zetasqlite-cli/go.sum
+++ b/cmd/zetasqlite-cli/go.sum
@@ -20,6 +20,8 @@ github.com/DataDog/go-hll v1.0.2 h1:Mm1HCqDMp/a6g/8OpJLkORYaRMy1AL0Kep8lopOgJeY=
 github.com/DataDog/go-hll v1.0.2/go.mod h1:nVlk+LiOuLOBG2pl+DJtGYBr6r6CUH/bGqebzrCUSKw=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
+github.com/MatanLevy/go-zetasqlite v0.17.10-0.20231213095134-9a693dd7e32d h1:oBpOIiu9eVBUeaRaivVbZh8FFhq1WCVEAH3hDXzw3nQ=
+github.com/MatanLevy/go-zetasqlite v0.17.10-0.20231213095134-9a693dd7e32d/go.mod h1:l1C/Lr+e3jA0MVpueHMy7xSIBRsoHijoXI8LKwp81wI=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/apache/arrow/go/v11 v11.0.0 h1:hqauxvFQxww+0mEU/2XHG6LT7eZternCZq+A5Yly2uM=
diff --git a/cmd/zetasqlite-cli/main.go b/cmd/zetasqlite-cli/main.go
index 15e6094..2d85112 100644
--- a/cmd/zetasqlite-cli/main.go
+++ b/cmd/zetasqlite-cli/main.go
@@ -11,10 +11,10 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/MatanLevy/go-zetasqlite"
 	"github.com/chzyer/readline"
 	"github.com/fatih/color"
 	"github.com/goccy/go-zetasql/types"
-	"github.com/goccy/go-zetasqlite"
 	"github.com/goccy/go-zetasqlite/internal"
 	"github.com/jessevdk/go-flags"
 	"github.com/olekukonko/tablewriter"
diff --git a/column.go b/column.go
index 39599e4..83fb77c 100644
--- a/column.go
+++ b/column.go
@@ -3,7 +3,7 @@ package zetasqlite
 import (
 	"github.com/goccy/go-json"
 
-	internal "github.com/goccy/go-zetasqlite/internal"
+	internal "github.com/MatanLevy/go-zetasqlite/internal"
 )
 
 type ColumnType = internal.Type
diff --git a/context.go b/context.go
index 8231034..444c952 100644
--- a/context.go
+++ b/context.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/goccy/go-zetasqlite/internal"
+	"github.com/MatanLevy/go-zetasqlite/internal"
 )
 
 // WithCurrentTime use to replace the current time with the specified time.
diff --git a/driver.go b/driver.go
index 3e93a8e..02198db 100644
--- a/driver.go
+++ b/driver.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"sync"
 
-	internal "github.com/goccy/go-zetasqlite/internal"
+	internal "github.com/MatanLevy/go-zetasqlite/internal"
 	"github.com/mattn/go-sqlite3"
 )
 
diff --git a/driver_test.go b/driver_test.go
index b3e3afa..4315a11 100644
--- a/driver_test.go
+++ b/driver_test.go
@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"testing"
 
-	zetasqlite "github.com/goccy/go-zetasqlite"
+	zetasqlite "github.com/MatanLevy/go-zetasqlite"
 	"github.com/google/go-cmp/cmp"
 )
 
diff --git a/exec_test.go b/exec_test.go
index afedd69..22a1c5a 100644
--- a/exec_test.go
+++ b/exec_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	zetasqlite "github.com/goccy/go-zetasqlite"
+	zetasqlite "github.com/MatanLevy/go-zetasqlite"
 	"github.com/google/go-cmp/cmp"
 )
 
diff --git a/internal/function_window_option.go b/internal/function_window_option.go
index bcfbed9..e231e2b 100644
--- a/internal/function_window_option.go
+++ b/internal/function_window_option.go
@@ -407,7 +407,7 @@ func (s *WindowFuncAggregatedStatus) Done(cb func([]Value, int, int) error) erro
 	copy(sortedValues, values)
 	if len(sortedValues) != 0 {
 		orderByObjects := sortedValues[0].OrderBy
-		if orderByObjects != nil && len(orderByObjects) != 0 {
+		if len(orderByObjects) != 0 {
 			sort.Slice(sortedValues, func(i, j int) bool {
 				for orderBy := 0; orderBy < len(orderByObjects); orderBy++ {
 					isAsc := orderByObjects[orderBy].IsAsc
diff --git a/internal/util.go b/internal/util.go
index aa4579f..705eda8 100644
--- a/internal/util.go
+++ b/internal/util.go
@@ -122,7 +122,7 @@ func lowerThanEquals(value1, value2 Value, isAscending bool) (bool, bool, error)
 }
 
 func sortValues(orderByList []*AggregateOrderBy, orderedValues []*OrderedValue) {
-	if orderByList == nil || len(orderByList) == 0 {
+	if len(orderByList) == 0 {
 		return
 	}
 
diff --git a/query_test.go b/query_test.go
index 78a0e55..f2b7669 100644
--- a/query_test.go
+++ b/query_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	zetasqlite "github.com/goccy/go-zetasqlite"
+	zetasqlite "github.com/MatanLevy/go-zetasqlite"
 	"github.com/google/go-cmp/cmp"
 )
 
diff --git a/timestamp.go b/timestamp.go
index d062d5c..b2d87b6 100644
--- a/timestamp.go
+++ b/timestamp.go
@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/goccy/go-zetasqlite/internal"
+	"github.com/MatanLevy/go-zetasqlite/internal"
 )
 
 // TimeFromTimestampValue zetasqlite returns string values ​​by default for timestamp values.