diff --git a/trunk/Projects/SAMufasaGUI/testunit.pas b/trunk/Projects/SAMufasaGUI/testunit.pas
index 9941a8a..966daf2 100644
--- a/trunk/Projects/SAMufasaGUI/testunit.pas
+++ b/trunk/Projects/SAMufasaGUI/testunit.pas
@@ -511,6 +511,7 @@ var
   AppPath : string;
   pluginspath: string;
   ScriptPath : string;
+  UseCPascal: String;
   loadFontsOnScriptStart: String;
 
 begin
@@ -533,8 +534,11 @@ begin
     PluginsPath := LoadSettingDef('Settings/Plugins/Path', ExpandFileName(MainDir + DS + '..' + DS + '..'+ DS + 'Plugins'+ DS));
     ScriptErrorLine:= -1;
     CurrentSyncInfo.SyncMethod:= @Self.SafeCallThread;
-    ScriptThread := TCPThread.Create('libcpascal',True,@CurrentSyncInfo,PluginsPath);
-    //ScriptThread := TPSThread.Create(True,@CurrentSyncInfo,PluginsPath);
+    UseCPascal := LoadSettingDef('Settings/Interpreter/UseCPascal', 'True');
+    if lowercase(UseCPascal) = 'true' then
+      ScriptThread := TCPThread.Create('libcpascal',True,@CurrentSyncInfo,PluginsPath)
+    else
+      ScriptThread := TPSThread.Create(True,@CurrentSyncInfo,PluginsPath);
     {$IFNDEF TERMINALWRITELN}
     ScriptThread.SetDebug(@formWriteln);
     ScriptThread.DebugMemo := Self.Memo1;
diff --git a/trunk/Units/MMLAddon/mmlpsthread.pas b/trunk/Units/MMLAddon/mmlpsthread.pas
index ba64b11..71ca40e 100644
--- a/trunk/Units/MMLAddon/mmlpsthread.pas
+++ b/trunk/Units/MMLAddon/mmlpsthread.pas
@@ -187,7 +187,6 @@ uses
   tpa, //Tpa stuff
   forms,//Forms
   lclintf  // for GetTickCount and others.
-  {$IFDEF SIMBA} ,testunit {$ENDIF}
   ;
 
 {$define PS_StdCall}