change to Java 1.6