Switched to JDK 1.6