diff --git a/utils/strings.go b/utils/strings.go
index dcdd8da736..39cc48b0d7 100644
--- a/utils/strings.go
+++ b/utils/strings.go
@@ -43,7 +43,7 @@ func Trim(s string, cutset byte) string {
 			break
 		}
 	}
-	for ; i < j; j-- {
+	for ; i <= j; j-- {
 		if s[j] != cutset {
 			break
 		}
diff --git a/utils/strings_test.go b/utils/strings_test.go
index 2ebb32838b..97002adfd0 100644
--- a/utils/strings_test.go
+++ b/utils/strings_test.go
@@ -126,6 +126,15 @@ func Test_Trim(t *testing.T) {
 
 	res = Trim(".test", '.')
 	AssertEqual(t, "test", res)
+
+	res = Trim(" ", ' ')
+	AssertEqual(t, "", res)
+
+	res = Trim("  ", ' ')
+	AssertEqual(t, "", res)
+
+	res = Trim("", ' ')
+	AssertEqual(t, "", res)
 }
 
 func Benchmark_Trim(b *testing.B) {