JNI fix