Port to java 1.6