Java fix (12/18)

Java fix