Updated to confirm with master of Java version