Change to java 1.7