Fix for Java 1.5