Work on Java version.