Fix to Java 7