diff --git a/Lib/java/enums.swg b/Lib/java/enums.swg
index 440fc9b5e..6eb5d108e 100644
--- a/Lib/java/enums.swg
+++ b/Lib/java/enums.swg
@@ -13,8 +13,8 @@
 %typemap(out) enum SWIGTYPE  %{ $result = (jint)$1; %}
 
 %typemap(directorin, descriptor="I") enum SWIGTYPE    "$input = (jint) $1;"
-%typemap(javadirectorin) enum SWIGTYPE "$jniinput"
-%typemap(javadirectorout) enum SWIGTYPE "$javacall"
+%typemap(javadirectorin) enum SWIGTYPE "$javaclassname.swigToEnum($jniinput)"
+%typemap(javadirectorout) enum SWIGTYPE "($javacall).swigValue()"
 
 %typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
 
diff --git a/Lib/java/enumtypesafe.swg b/Lib/java/enumtypesafe.swg
index a8ab1ce3d..d6fb85c5f 100644
--- a/Lib/java/enumtypesafe.swg
+++ b/Lib/java/enumtypesafe.swg
@@ -12,8 +12,8 @@
 %typemap(out) enum SWIGTYPE  %{ $result = (jint)$1; %}
 
 %typemap(directorin, descriptor="I") enum SWIGTYPE    "$input = (jint) $1;"
-%typemap(javadirectorin) enum SWIGTYPE "$jniinput"
-%typemap(javadirectorout) enum SWIGTYPE "$javacall"
+%typemap(javadirectorin) enum SWIGTYPE "$javaclassname.swigToEnum($jniinput)"
+%typemap(javadirectorout) enum SWIGTYPE "($javacall).swigValue()"
 
 %typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""