Changed to JDK1.6