Commit 3 - Java Fix