Back to java 1.6