changed to Java 1.7