diff --git a/PhotoPicker/build.gradle b/PhotoPicker/build.gradle
index 572c863..8584725 100644
--- a/PhotoPicker/build.gradle
+++ b/PhotoPicker/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
   compileSdkVersion 23
-  buildToolsVersion "23.0.2"
+  buildToolsVersion "23.0.3"
   resourcePrefix "__picker_"
 
   defaultConfig {
diff --git a/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoGridAdapter.java b/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoGridAdapter.java
index 3303f2b..cf0a178 100644
--- a/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoGridAdapter.java
+++ b/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoGridAdapter.java
@@ -199,4 +199,10 @@ public void setShowCamera(boolean hasCamera) {
   public boolean showCamera() {
     return (hasCamera && currentDirectoryIndex == MediaStoreHelper.INDEX_ALL_PHOTOS);
   }
+
+  @Override public void onViewDetachedFromWindow(PhotoViewHolder holder) {
+    super.onViewDetachedFromWindow(holder);
+
+    Glide.clear(holder.ivPhoto);
+  }
 }
diff --git a/PhotoPicker/src/main/java/me/iwf/photopicker/fragment/ImagePagerFragment.java b/PhotoPicker/src/main/java/me/iwf/photopicker/fragment/ImagePagerFragment.java
index 12cb01a..be89b84 100644
--- a/PhotoPicker/src/main/java/me/iwf/photopicker/fragment/ImagePagerFragment.java
+++ b/PhotoPicker/src/main/java/me/iwf/photopicker/fragment/ImagePagerFragment.java
@@ -301,5 +301,7 @@ public int getCurrentItem() {
 
     paths.clear();
     paths = null;
+
+    mViewPager.setAdapter(null);
   }
 }