Change to JDK-1.6