diff --git a/src/loaders/external_jpg/tvgJpgLoader.cpp b/src/loaders/external_jpg/tvgJpgLoader.cpp
index 4f28003b..cb46d5c9 100644
--- a/src/loaders/external_jpg/tvgJpgLoader.cpp
+++ b/src/loaders/external_jpg/tvgJpgLoader.cpp
@@ -147,7 +147,7 @@ bool JpgLoader::read()
 }
 
 
-unique_ptr<Surface> JpgLoader::bitmap()
+Surface* JpgLoader::bitmap()
 {
     if (!image) return nullptr;
 
@@ -162,5 +162,5 @@ unique_ptr<Surface> JpgLoader::bitmap()
     surface->premultiplied = true;
     surface->owner = true;
 
-    return unique_ptr<Surface>(surface);
+    return surface;
 }
diff --git a/src/loaders/external_jpg/tvgJpgLoader.h b/src/loaders/external_jpg/tvgJpgLoader.h
index 9c7a6d18..f9b4c9ea 100644
--- a/src/loaders/external_jpg/tvgJpgLoader.h
+++ b/src/loaders/external_jpg/tvgJpgLoader.h
@@ -38,7 +38,7 @@ public:
     bool open(const char* data, uint32_t size, bool copy) override;
     bool read() override;
 
-    unique_ptr<Surface> bitmap() override;
+    Surface* bitmap() override;
 
 private:
     void clear();
diff --git a/src/loaders/external_png/tvgPngLoader.cpp b/src/loaders/external_png/tvgPngLoader.cpp
index 40594326..4b828c6a 100644
--- a/src/loaders/external_png/tvgPngLoader.cpp
+++ b/src/loaders/external_png/tvgPngLoader.cpp
@@ -106,7 +106,7 @@ bool PngLoader::read()
 }
 
 
-unique_ptr<Surface> PngLoader::bitmap()
+Surface* PngLoader::bitmap()
 {
     if (!content) return nullptr;
 
@@ -121,5 +121,5 @@ unique_ptr<Surface> PngLoader::bitmap()
     surface->owner = true;
     surface->premultiplied = false;
 
-    return unique_ptr<Surface>(surface);
+    return surface;
 }
\ No newline at end of file
diff --git a/src/loaders/external_png/tvgPngLoader.h b/src/loaders/external_png/tvgPngLoader.h
index b52c1bfd..c6f04a35 100644
--- a/src/loaders/external_png/tvgPngLoader.h
+++ b/src/loaders/external_png/tvgPngLoader.h
@@ -36,7 +36,7 @@ public:
     bool open(const char* data, uint32_t size, bool copy) override;
     bool read() override;
 
-    unique_ptr<Surface> bitmap() override;
+    Surface* bitmap() override;
 
 private:
     void clear();
diff --git a/src/loaders/external_webp/tvgWebpLoader.cpp b/src/loaders/external_webp/tvgWebpLoader.cpp
index faa5a784..551a09b6 100644
--- a/src/loaders/external_webp/tvgWebpLoader.cpp
+++ b/src/loaders/external_webp/tvgWebpLoader.cpp
@@ -126,7 +126,7 @@ bool WebpLoader::read()
 }
 
 
-unique_ptr<Surface> WebpLoader::bitmap()
+Surface* WebpLoader::bitmap()
 {
     this->done();
 
@@ -142,5 +142,5 @@ unique_ptr<Surface> WebpLoader::bitmap()
     surface->channelSize = sizeof(uint32_t);
     surface->premultiplied = false;
     surface->owner = true;
-    return unique_ptr<Surface>(surface);
+    return surface;
 }
\ No newline at end of file
diff --git a/src/loaders/external_webp/tvgWebpLoader.h b/src/loaders/external_webp/tvgWebpLoader.h
index cd3eaa95..4865a588 100644
--- a/src/loaders/external_webp/tvgWebpLoader.h
+++ b/src/loaders/external_webp/tvgWebpLoader.h
@@ -36,7 +36,7 @@ public:
     bool open(const char* data, uint32_t size, bool copy) override;
     bool read() override;
 
-    unique_ptr<Surface> bitmap() override;
+    Surface* bitmap() override;
 
 private:
     void run(unsigned tid) override;
diff --git a/src/loaders/jpg/tvgJpgLoader.cpp b/src/loaders/jpg/tvgJpgLoader.cpp
index 122fb2cb..7c3bf514 100644
--- a/src/loaders/jpg/tvgJpgLoader.cpp
+++ b/src/loaders/jpg/tvgJpgLoader.cpp
@@ -125,7 +125,7 @@ bool JpgLoader::close()
 }
 
 
-unique_ptr<Surface> JpgLoader::bitmap()
+Surface* JpgLoader::bitmap()
 {
     this->done();
 
@@ -142,5 +142,5 @@ unique_ptr<Surface> JpgLoader::bitmap()
     surface->premultiplied = true;
     surface->owner = true;
 
-    return unique_ptr<Surface>(surface);
+    return surface;
 }
\ No newline at end of file
diff --git a/src/loaders/jpg/tvgJpgLoader.h b/src/loaders/jpg/tvgJpgLoader.h
index 04a8738e..9e78282c 100644
--- a/src/loaders/jpg/tvgJpgLoader.h
+++ b/src/loaders/jpg/tvgJpgLoader.h
@@ -47,7 +47,7 @@ public:
     bool read() override;
     bool close() override;
 
-    unique_ptr<Surface> bitmap() override;
+    Surface* bitmap() override;
 };
 
 #endif //_TVG_JPG_LOADER_H_
diff --git a/src/loaders/png/tvgPngLoader.cpp b/src/loaders/png/tvgPngLoader.cpp
index 0237a0d8..7e84839c 100644
--- a/src/loaders/png/tvgPngLoader.cpp
+++ b/src/loaders/png/tvgPngLoader.cpp
@@ -140,7 +140,7 @@ bool PngLoader::read()
 }
 
 
-unique_ptr<Surface> PngLoader::bitmap()
+Surface* PngLoader::bitmap()
 {
     this->done();
 
@@ -157,5 +157,5 @@ unique_ptr<Surface> PngLoader::bitmap()
     surface->premultiplied = false;
     surface->owner = true;
 
-    return unique_ptr<Surface>(surface);
+    return surface;
 }
\ No newline at end of file
diff --git a/src/loaders/png/tvgPngLoader.h b/src/loaders/png/tvgPngLoader.h
index 044e0f93..2de33f5a 100644
--- a/src/loaders/png/tvgPngLoader.h
+++ b/src/loaders/png/tvgPngLoader.h
@@ -46,7 +46,7 @@ public:
     bool open(const char* data, uint32_t size, bool copy) override;
     bool read() override;
 
-    unique_ptr<Surface> bitmap() override;
+    Surface* bitmap() override;
 };
 
 #endif //_TVG_PNG_LOADER_H_
diff --git a/src/loaders/raw/tvgRawLoader.cpp b/src/loaders/raw/tvgRawLoader.cpp
index b594e12d..84c9e50d 100644
--- a/src/loaders/raw/tvgRawLoader.cpp
+++ b/src/loaders/raw/tvgRawLoader.cpp
@@ -78,7 +78,7 @@ bool RawLoader::read()
 }
 
 
-unique_ptr<Surface> RawLoader::bitmap()
+Surface* RawLoader::bitmap()
 {
     if (!content) return nullptr;
 
@@ -93,5 +93,5 @@ unique_ptr<Surface> RawLoader::bitmap()
     surface->premultiplied = true;
     surface->owner = true;
 
-    return unique_ptr<Surface>(surface);
+    return surface;
 }
diff --git a/src/loaders/raw/tvgRawLoader.h b/src/loaders/raw/tvgRawLoader.h
index 69547e78..eb01c6f2 100644
--- a/src/loaders/raw/tvgRawLoader.h
+++ b/src/loaders/raw/tvgRawLoader.h
@@ -36,7 +36,7 @@ public:
     bool open(const uint32_t* data, uint32_t w, uint32_t h, bool copy);
     bool read() override;
 
-    unique_ptr<Surface> bitmap() override;
+    Surface* bitmap() override;
 };
 
 
diff --git a/src/renderer/tvgLoadModule.h b/src/renderer/tvgLoadModule.h
index 0ef3ac25..dbc4a252 100644
--- a/src/renderer/tvgLoadModule.h
+++ b/src/renderer/tvgLoadModule.h
@@ -74,7 +74,7 @@ struct ImageLoader : LoadModule
     ImageLoader(FileType type) : LoadModule(type) {}
 
     virtual bool animatable() { return false; }  //true if this loader supports animation.
-    virtual unique_ptr<Surface> bitmap() { return nullptr; }
+    virtual Surface* bitmap() { return nullptr; }
     virtual Paint* paint() { return nullptr; }
 };
 
diff --git a/src/renderer/tvgPicture.cpp b/src/renderer/tvgPicture.cpp
index 3fb44e56..7f120593 100644
--- a/src/renderer/tvgPicture.cpp
+++ b/src/renderer/tvgPicture.cpp
@@ -45,7 +45,7 @@ RenderUpdateFlag Picture::Impl::load()
         } else loader->sync();
 
         if (!surface) {
-            if ((surface = loader->bitmap().release())) {
+            if ((surface = loader->bitmap())) {
                 return RenderUpdateFlag::Image;
             }
         }