Update to include java fix on my fork