diff --git a/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go b/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go
index e7465f2da7..97a572336b 100644
--- a/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go
@@ -43,6 +43,34 @@ func (q *Queries) ListAuthorsColumnSort(ctx context.Context, arg ListAuthorsColu
 	return items, nil
 }
 
+const listAuthorsColumnSortFnWtihArg = `-- name: ListAuthorsColumnSortFnWtihArg :many
+SELECT  id, name, bio FROM authors
+ORDER   BY MOD(id, ?)
+`
+
+func (q *Queries) ListAuthorsColumnSortFnWtihArg(ctx context.Context, modArg int64) ([]Author, error) {
+	rows, err := q.db.QueryContext(ctx, listAuthorsColumnSortFnWtihArg, modArg)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Author
+	for rows.Next() {
+		var i Author
+		if err := rows.Scan(&i.ID, &i.Name, &i.Bio); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const listAuthorsNameSort = `-- name: ListAuthorsNameSort :many
 SELECT  id, name, bio FROM authors
 WHERE   id > ?
diff --git a/internal/endtoend/testdata/order_by_binds/mysql/query.sql b/internal/endtoend/testdata/order_by_binds/mysql/query.sql
index e662d8f06a..c43763c838 100644
--- a/internal/endtoend/testdata/order_by_binds/mysql/query.sql
+++ b/internal/endtoend/testdata/order_by_binds/mysql/query.sql
@@ -3,6 +3,10 @@ SELECT  * FROM authors
 WHERE   id > sqlc.arg(min_id) 
 ORDER   BY CASE WHEN sqlc.arg(sort_column) = 'name' THEN name END;
 
+-- name: ListAuthorsColumnSortFnWtihArg :many
+SELECT  * FROM authors
+ORDER   BY MOD(id, sqlc.arg(mod_arg));
+
 -- name: ListAuthorsNameSort :many
 SELECT  * FROM authors
 WHERE   id > sqlc.arg(min_id)
diff --git a/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go b/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go
index 272c3cb876..e246baf24b 100644
--- a/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go
@@ -43,6 +43,34 @@ func (q *Queries) ListAuthorsColumnSort(ctx context.Context, arg ListAuthorsColu
 	return items, nil
 }
 
+const listAuthorsColumnSortFnWtihArg = `-- name: ListAuthorsColumnSortFnWtihArg :many
+SELECT  id, name, bio FROM authors
+ORDER   BY MOD(id, $1)
+`
+
+func (q *Queries) ListAuthorsColumnSortFnWtihArg(ctx context.Context, mod int64) ([]Author, error) {
+	rows, err := q.db.QueryContext(ctx, listAuthorsColumnSortFnWtihArg, mod)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Author
+	for rows.Next() {
+		var i Author
+		if err := rows.Scan(&i.ID, &i.Name, &i.Bio); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const listAuthorsNameSort = `-- name: ListAuthorsNameSort :many
 SELECT  id, name, bio FROM authors
 WHERE   id > $1
diff --git a/internal/endtoend/testdata/order_by_binds/postgresql/query.sql b/internal/endtoend/testdata/order_by_binds/postgresql/query.sql
index e662d8f06a..961d3f4e71 100644
--- a/internal/endtoend/testdata/order_by_binds/postgresql/query.sql
+++ b/internal/endtoend/testdata/order_by_binds/postgresql/query.sql
@@ -3,6 +3,10 @@ SELECT  * FROM authors
 WHERE   id > sqlc.arg(min_id) 
 ORDER   BY CASE WHEN sqlc.arg(sort_column) = 'name' THEN name END;
 
+-- name: ListAuthorsColumnSortFnWtihArg :many
+SELECT  * FROM authors
+ORDER   BY MOD(id, $1);
+
 -- name: ListAuthorsNameSort :many
 SELECT  * FROM authors
 WHERE   id > sqlc.arg(min_id)
diff --git a/internal/engine/dolphin/convert.go b/internal/engine/dolphin/convert.go
index d6f1a4e4a2..e3ef23dc7a 100644
--- a/internal/engine/dolphin/convert.go
+++ b/internal/engine/dolphin/convert.go
@@ -1025,18 +1025,7 @@ func (c *cc) convertOrderByClause(n *pcast.OrderByClause) ast.Node {
 	}
 	list := &ast.List{Items: []ast.Node{}}
 	for _, item := range n.Items {
-		switch item.Expr.(type) {
-		case *pcast.CaseExpr:
-			list.Items = append(list.Items, &ast.CaseWhen{
-				Expr:     c.convert(item.Expr),
-				Location: item.Expr.OriginTextPosition(),
-			})
-		case *pcast.ColumnNameExpr:
-			list.Items = append(list.Items, &ast.CaseExpr{
-				Xpr:      c.convert(item.Expr),
-				Location: item.Expr.OriginTextPosition(),
-			})
-		}
+		list.Items = append(list.Items, c.convert(item.Expr))
 	}
 	return list
 }