Fix for Java classes