Fixed to .java files