Changed back to java 1.6