diff --git a/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt b/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt
index f935fac91..7a6e23d55 100644
--- a/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt
+++ b/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt
@@ -266,11 +266,12 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
                     return cx
                 }
 
-                override fun hasFeature(cx: Context?, featureIndex: Int): Boolean {
-                    if (featureIndex == Context.FEATURE_ENABLE_JAVA_MAP_ACCESS) {
-                        return true
+                override fun hasFeature(cx: Context, featureIndex: Int): Boolean {
+                    return when (featureIndex) {
+                        Context.FEATURE_ENABLE_JAVA_MAP_ACCESS -> true
+                        Context.FEATURE_ENHANCED_JAVA_ACCESS -> true
+                        else -> super.hasFeature(cx, featureIndex)
                     }
-                    return super.hasFeature(cx, featureIndex)
                 }
 
                 override fun doTopCall(