Further java fix.