diff --git a/internal/convert/convert_safe.go b/internal/convert/convert_safe.go
index 97229cb0..8b76f0cb 100644
--- a/internal/convert/convert_safe.go
+++ b/internal/convert/convert_safe.go
@@ -1,5 +1,4 @@
 //go:build appengine
-// +build appengine
 
 package convert
 
diff --git a/internal/convert/convert_unsafe.go b/internal/convert/convert_unsafe.go
index 55865983..8b554859 100644
--- a/internal/convert/convert_unsafe.go
+++ b/internal/convert/convert_unsafe.go
@@ -1,5 +1,4 @@
 //go:build !appengine
-// +build !appengine
 
 package convert
 
@@ -7,15 +6,10 @@ import "unsafe"
 
 // BytesToString converts byte slice to string.
 func BytesToString(b []byte) string {
-	return *(*string)(unsafe.Pointer(&b))
+	return unsafe.String(unsafe.SliceData(b), len(b))
 }
 
 // StringToBytes converts string to byte slice.
 func StringToBytes(s string) []byte {
-	return *(*[]byte)(unsafe.Pointer(
-		&struct {
-			string
-			Cap int
-		}{s, len(s)},
-	))
+	return unsafe.Slice(unsafe.StringData(s), len(s))
 }