Changed to Java 1.6