2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index a43d3a6..a1311ce 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 CHANGES:
 
+CHANGE 128: BGe 31-Oct-18
+   * Better default value autodetection for protect_allocator setting
+
 CHANGE 127: BGe 30-Oct-18
    * restrict internal light userdata constants to 47 significant bits when building against LuaJIT-x64
 
diff --git a/src/lanes.lua b/src/lanes.lua
index 09603b3..54fa0ac 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -77,7 +77,7 @@ lanes.configure = function( settings_)
                 demote_full_userdata = nil,
                 verbose_errors = false,
                 -- LuaJIT provides a thread-unsafe allocator by default, so we need to protect it when used in parallel lanes
-                protect_allocator = (package.loaded.jit and jit.version) and true or false
+                protect_allocator = (package.loaded.jit and jit.version and (package.loaded.ffi.abi( "32bit") or package.loaded.ffi.abi( "gc64"))) and true or false
         }
         local boolean_param_checker = function( val_)
                 -- non-'boolean-false' should be 'boolean-true' or nil