Change to Java 1.6