Switched to Java 1.6