diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs
index 5abbc7a671..220f456639 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
     {
         public static readonly string OBJECT_CODE_MAGIC = "YObjectCode";
         // reserve positive version values for original xmr
-        public static int COMPILED_VERSION_VALUE = -5;  // decremented when compiler or object file changes
+        public static int COMPILED_VERSION_VALUE = -6;  // decremented when compiler or object file changes
 
         public static readonly int CALL_FRAME_MEMUSE = 64;
         public static readonly int STRING_LEN_TO_MEMUSE = 2;
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstMisc.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstMisc.cs
index 43bd78f24e..45d3121ec9 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstMisc.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstMisc.cs
@@ -397,8 +397,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
                             else
                                 m_IState = XMRInstState.IDLE;
                         }
-                        else if(m_SuspendCount != 0)
-                            m_IState = XMRInstState.IDLE;
+                        //else if(m_SuspendCount != 0)
+                        //    m_IState = XMRInstState.IDLE;
                     }
                     else
                     {
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
index 6899ad4e8e..191dc0bcd1 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
@@ -1020,6 +1020,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
         {
             lock(m_QueueLock)
             {
+                m_SuspendCount = 0;
                 m_Suspended = false;
                 m_DetachQuantum = 0;
                 m_DetachReady.Set();
@@ -1041,6 +1042,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
         {
             lock(m_QueueLock)
             {
+                m_SuspendCount = 1;
                 m_Suspended = true;
             }
         }