Fixed for Java 6