Avoid problems with Java 7