diff --git a/app/build.gradle b/app/build.gradle
index b2792e571b..bf6d37c52d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ android {
     sourceSets {
         main {
             if (rootProject.isJunkDetectEnable()) {
-                java.srcDirs = ['src/main/java', 'src/debug/java']
+                java.srcDirs = ['src/main/java', 'src/block/java']
             } else {
                 java.srcDirs = ['src/main/java']
             }
diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java b/app/src/block/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java
similarity index 100%
rename from app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java
rename to app/src/block/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java
diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt b/app/src/block/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt
similarity index 100%
rename from app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt
rename to app/src/block/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt
diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java b/app/src/block/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java
similarity index 100%
rename from app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java
rename to app/src/block/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java
diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt b/app/src/block/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt
similarity index 100%
rename from app/src/debug/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt
rename to app/src/block/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt
diff --git a/app/src/main/java/com/mogo/launcher/lancet/ViewPressedStateLancet.java b/app/src/main/java/com/mogo/launcher/lancet/ViewPressedStateLancet.java
index cdfb67fb94..2e7f4d47cc 100644
--- a/app/src/main/java/com/mogo/launcher/lancet/ViewPressedStateLancet.java
+++ b/app/src/main/java/com/mogo/launcher/lancet/ViewPressedStateLancet.java
@@ -72,6 +72,10 @@ public class ViewPressedStateLancet {
         if (view == null) {
             return;
         }
+        if (listener == null) {
+            view.setOnClickListener(null);
+            return;
+        }
         view.setOnClickListener(new OnClickWrapper(listener));
     }
 
@@ -82,6 +86,10 @@ public class ViewPressedStateLancet {
         if (view == null) {
             return;
         }
+        if (listener == null) {
+            view.setOnLongClickListener(null);
+            return;
+        }
         view.setOnLongClickListener(new OnLongClickWrapper(listener));
     }
 
@@ -89,7 +97,6 @@ public class ViewPressedStateLancet {
     @Insert(mayCreateSuper = true)
     @TargetMethod(methodName = "onCreateView")
     public View onCreateView(String name, Context context, AttributeSet attrs) {
-        Log.d("XXXXXX", "onCreateView -- 1: name:" + name);
         View view = (View) Origin.call();
         if (view == null && attrs != null) {
             view = tryCreateView(name, context, attrs);
@@ -102,7 +109,6 @@ public class ViewPressedStateLancet {
     @Insert(mayCreateSuper = true)
     @TargetMethod(methodName = "onCreateView")
     public View onCreateView(View parent, String name, Context context, AttributeSet attrs) {
-        Log.d("XXXXXX", "onCreateView -- 2: name:" + name);
         View view = (View) Origin.call();
         if (view == null && attrs != null) {
             view = tryCreateView(name, context, attrs);
@@ -239,9 +245,11 @@ public class ViewPressedStateLancet {
                 }
                 return;
             }
-            Drawable replaced = checkAndReplaceDrawable(view.getBackground(), alpha);
-            if (replaced != null) {
-                ViewCompat.setBackground(view, replaced);
+            if (view != null) {
+                Drawable replaced = checkAndReplaceDrawable(view.getBackground(), alpha);
+                if (replaced != null) {
+                    ViewCompat.setBackground(view, replaced);
+                }
             }
         } catch (Throwable t) {
             t.printStackTrace();