Changed to Java 1.7