Java 7 fixed