diff --git a/routergroup.go b/routergroup.go
index 4ded0d6..816d74a 100644
--- a/routergroup.go
+++ b/routergroup.go
@@ -123,9 +123,7 @@ func (group *RouterGroup) StaticFS(relativePath string, fs http.FileSystem) {
 func (group *RouterGroup) createStaticHandler(relativePath string, fs http.FileSystem) func(*Context) {
 	absolutePath := group.calculateAbsolutePath(relativePath)
 	fileServer := http.StripPrefix(absolutePath, http.FileServer(fs))
-	return func(c *Context) {
-		fileServer.ServeHTTP(c.Writer, c.Request)
-	}
+	return WrapH(fileServer)
 }
 
 func (group *RouterGroup) combineHandlers(handlers HandlersChain) HandlersChain {
diff --git a/utils_test.go b/utils_test.go
index 19fab5d..ba0cc20 100644
--- a/utils_test.go
+++ b/utils_test.go
@@ -46,10 +46,6 @@ func TestWrap(t *testing.T) {
 	assert.Equal(t, w.Body.String(), "hola!")
 }
 
-func TestWrapH(t *testing.T) {
-
-}
-
 func TestLastChar(t *testing.T) {
 	assert.Equal(t, lastChar("hola"), uint8('a'))
 	assert.Equal(t, lastChar("adios"), uint8('s'))