Another try at fixing JVM setup