Switched to JDK 1.7