Changed to JDK 1.6