diff --git a/autogl.h b/autogl.h
index 5d25e44..5eeca85 100644
--- a/autogl.h
+++ b/autogl.h
@@ -61,9 +61,10 @@
 
   AutoEGLDisplayImage(const AutoEGLDisplayImage& rhs) = delete;
   AutoEGLDisplayImage(AutoEGLDisplayImage&& rhs) {
-    clear();
-    std::swap(display_, rhs.display_);
-    std::swap(image_, rhs.image_);
+    display_ = rhs.display_;
+    image_ = rhs.image_;
+    rhs.display_ = EGL_NO_DISPLAY;
+    rhs.image_ = EGL_NO_IMAGE_KHR;
   }
 
   ~AutoEGLDisplayImage() {