JNI Fix