diff --git a/vm/compiler/Frontend.c b/vm/compiler/Frontend.c
index 7d28b36..3c1e837 100644
--- a/vm/compiler/Frontend.c
+++ b/vm/compiler/Frontend.c
@@ -820,7 +820,7 @@
             /* For unconditional branches, request a hot chaining cell */
             } else {
 #if !defined(WITH_SELF_VERIFICATION)
-                newBB = dvmCompilerNewBB(flags & kInstrUnconditional ?
+                newBB = dvmCompilerNewBB(dexIsGoto(flags) ?
                                                   kChainingCellHot :
                                                   kChainingCellNormal);
                 newBB->startOffset = targetOffset;
@@ -830,7 +830,7 @@
                     targetOffset <= curBB->lastMIRInsn->offset) {
                     newBB = dvmCompilerNewBB(kChainingCellBackwardBranch);
                 } else {
-                    newBB = dvmCompilerNewBB(flags & kInstrUnconditional ?
+                    newBB = dvmCompilerNewBB(dexIsGoto(flags) ?
                                                       kChainingCellHot :
                                                       kChainingCellNormal);
                 }