migrate to java 1.6