More java fixing
Another attempt at a fix