Fix to Java 5