Java 6 fix