Changed to JDK 1.7