diff --git a/callback.go b/callback.go
index 84526236..93198a71 100644
--- a/callback.go
+++ b/callback.go
@@ -41,6 +41,7 @@ func (c *Callback) clone() *Callback {
 		updates:    c.updates,
 		deletes:    c.deletes,
 		queries:    c.queries,
+		rowQueries: c.rowQueries,
 		processors: c.processors,
 	}
 }
diff --git a/utils.go b/utils.go
index 8ac4fa7d..dc69e804 100644
--- a/utils.go
+++ b/utils.go
@@ -81,7 +81,7 @@ func ToDBName(name string) string {
 	)
 
 	for i, v := range value[:len(value)-1] {
-		nextCase = value[i+1] >= 'A' && value[i+1] <= 'Z'
+		nextCase = strCase(value[i+1] >= 'A' && value[i+1] <= 'Z')
 		if i > 0 {
 			if currCase == upper {
 				if lastCase == upper && nextCase == upper {