Fix for Java 6 I hope