Kaba: java fix