diff --git a/path.go b/path.go
index 6ea02951cf..f652f5c678 100644
--- a/path.go
+++ b/path.go
@@ -271,12 +271,12 @@ func (routeParser *routeParser) analyseParameterPart(pattern string) (string, *r
 			// Assign constraint
 			if start != -1 && end != -1 {
 				constraint := &Constraint{
-					ID:   getParamConstraintType(c[:start]),
-					Data: splitNonEscaped(c[start+1:end], string(parameterConstraintDataSeparatorChars)),
+					ID: getParamConstraintType(c[:start]),
 				}
 
 				// remove escapes from data
 				if constraint.ID != regexConstraint {
+					constraint.Data = splitNonEscaped(c[start+1:end], string(parameterConstraintDataSeparatorChars))
 					if len(constraint.Data) == 1 {
 						constraint.Data[0] = RemoveEscapeChar(constraint.Data[0])
 					} else if len(constraint.Data) == 2 {
@@ -287,6 +287,7 @@ func (routeParser *routeParser) analyseParameterPart(pattern string) (string, *r
 
 				// Precompile regex if has regex constraint
 				if constraint.ID == regexConstraint {
+					constraint.Data = []string{c[start+1 : end]}
 					constraint.RegexCompiler = regexp.MustCompile(constraint.Data[0])
 				}
 
diff --git a/path_test.go b/path_test.go
index a702eaa207..7ef56eb5c8 100644
--- a/path_test.go
+++ b/path_test.go
@@ -6,6 +6,7 @@ package fiber
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/gofiber/fiber/v2/utils"
@@ -526,6 +527,12 @@ func Test_Path_matchParams(t *testing.T) {
 		{url: "/api/v1/peach", params: []string{"peach"}, match: true},
 		{url: "/api/v1/p34ch", params: nil, match: false},
 	})
+	testCase("/api/v1/:param<regex(^[a-z0-9]([a-z0-9-]{1,61}[a-z0-9])?$)>", []testparams{
+		{url: "/api/v1/12", params: nil, match: false},
+		{url: "/api/v1/xy", params: nil, match: false},
+		{url: "/api/v1/test", params: []string{"test"}, match: true},
+		{url: "/api/v1/" + strings.Repeat("a", 64), params: nil, match: false},
+	})
 	testCase("/api/v1/:param<regex(\\d{4}-\\d{2}-\\d{2})}>", []testparams{
 		{url: "/api/v1/ent", params: nil, match: false},
 		{url: "/api/v1/15", params: nil, match: false},