Changed to Java 6