Fix for Java 6