Switched to Java 7