diff --git a/server/plugin/plg_image_heavy/index.go b/server/plugin/plg_image_heavy/index.go
index ed31e9e1..dde18626 100644
--- a/server/plugin/plg_image_heavy/index.go
+++ b/server/plugin/plg_image_heavy/index.go
@@ -13,7 +13,7 @@ func Init(config *Configuration) {
 	plugin_enable := config.Get("feature.image.enable").Default(true).Bool()
 	plugin_thumbsize := uint(config.Get("feature.image.thumbnail_size").Default(300).Int())
 
-	Hooks.Register.ProcessFileContentBeforeSend(func(reader io.ReadCloser, ctx *App, res *http.ResponseWriter, req *http.Request) (io.Reader, error){
+	Hooks.Register.ProcessFileContentBeforeSend(func(reader io.ReadCloser, ctx *App, res *http.ResponseWriter, req *http.Request) (io.ReadCloser, error){
 		if plugin_enable == false {
 			return reader, nil
 		}
@@ -36,6 +36,6 @@ func Init(config *Configuration) {
 		img = resize.Resize(plugin_thumbsize, 0, img, resize.Lanczos3)
 		out := bytes.NewBufferString("")
 		jpeg.Encode(out, img, &jpeg.Options{50})
-		return out, nil
+		return NewReadCloserFromReader(out), nil
 	})
 }
diff --git a/server/plugin/plg_image_light/index.go b/server/plugin/plg_image_light/index.go
index 818295ca..dc89877f 100644
--- a/server/plugin/plg_image_light/index.go
+++ b/server/plugin/plg_image_light/index.go
@@ -119,7 +119,7 @@ func Init(conf *Configuration) {
 	os.RemoveAll(cachePath)
 	os.MkdirAll(cachePath, os.ModePerm)
 
-	Hooks.Register.ProcessFileContentBeforeSend(func (reader io.ReadCloser, ctx *App, res *http.ResponseWriter, req *http.Request) (io.Reader, error){
+	Hooks.Register.ProcessFileContentBeforeSend(func (reader io.ReadCloser, ctx *App, res *http.ResponseWriter, req *http.Request) (io.ReadCloser, error){
 		if plugin_enable() == false {
 			return reader, nil
 		}
diff --git a/server/plugin/plg_image_light/lib/resizer.go b/server/plugin/plg_image_light/lib/resizer.go
index 73590340..f6a8d178 100644
--- a/server/plugin/plg_image_light/lib/resizer.go
+++ b/server/plugin/plg_image_light/lib/resizer.go
@@ -6,7 +6,6 @@ package lib
 import "C"
 
 import (
-	"bytes"
 	. "github.com/mickael-kerjean/filestash/server/common"
 	"io"
 	"runtime"
@@ -31,7 +30,7 @@ func init() {
 	LIBVIPS_INSTALLED = true
 }
 
-func CreateThumbnail(t *Transform) (io.Reader, error) {
+func CreateThumbnail(t *Transform) (io.ReadCloser, error) {
 	if LIBVIPS_INSTALLED == false {
 		return nil, NewError("Libvips not installed", 501)
 	}
@@ -45,7 +44,7 @@ func CreateThumbnail(t *Transform) (io.Reader, error) {
 	}
 	buf := C.GoBytes(buffer, C.int(len))
 	C.g_free(C.gpointer(buffer))
-	return bytes.NewReader(buf), nil
+	return NewReadCloserFromBytes(buf), nil
 }
 
 func boolToCInt(val bool) C.int {