diff --git a/GleeBug/Debugger.cpp b/GleeBug/Debugger.cpp
index 4d42506..cb78e8b 100644
--- a/GleeBug/Debugger.cpp
+++ b/GleeBug/Debugger.cpp
@@ -5,12 +5,10 @@ namespace GleeBug
     Debugger::Debugger()
     {
         mProcesses.clear();
-        Capstone::GlobalInitialize(); //TODO: properly handle this
     }
 
     Debugger::~Debugger()
     {
-        Capstone::GlobalFinalize(); //TODO: properly handle this
     }
 
     bool Debugger::Init(const wchar_t* szFilePath,
@@ -102,5 +100,9 @@ namespace GleeBug
     {
         mDetachAndBreak = true;
         mDetach = false;
+
+        //unset the trap flag when set by GleeBug
+        if (mThread->isInternalStepping)
+            mRegisters->TrapFlag = false;
     }
 };
\ No newline at end of file