diff --git a/SMPStaticAnalyzer b/SMPStaticAnalyzer
index 7eeabcd87854ddf758e0b89041ae79a2ebf2179c..58f936dced7f7437a5be64026abb485fa1be2250 160000
--- a/SMPStaticAnalyzer
+++ b/SMPStaticAnalyzer
@@ -1 +1 @@
-Subproject commit 7eeabcd87854ddf758e0b89041ae79a2ebf2179c
+Subproject commit 58f936dced7f7437a5be64026abb485fa1be2250
diff --git a/irdb-libs/libIRDB-core/src/decode_csarm64.cpp b/irdb-libs/libIRDB-core/src/decode_csarm64.cpp
index ab8ebaf161fa07107ee34c6c9c31851a06449481..350b142cf2b557c650cfe2e606f441b9fc42aea8 100644
--- a/irdb-libs/libIRDB-core/src/decode_csarm64.cpp
+++ b/irdb-libs/libIRDB-core/src/decode_csarm64.cpp
@@ -27,7 +27,7 @@ DecodedInstructionCapstoneARM_t::CapstoneHandle_t::CapstoneHandle_t(FileIR_t* fi
 {
 	static_assert(sizeof(csh)==sizeof(handle), "Capstone handle size is unexpected.  Has CS changed?");
 
-	const auto mode = CS_MODE_LITTLE_ENDIAN;
+	const auto mode = static_cast<cs_mode>(CS_MODE_LITTLE_ENDIAN | ( firp->getArchitectureBitWidth() == 32 ? CS_MODE_V8 : 0));
 	const auto arch = 
 		firp->getArchitectureBitWidth() == 64 ? CS_ARCH_ARM64 : 
 		firp->getArchitectureBitWidth() == 32 ? CS_ARCH_ARM   :