Java 1.6 hotfix