Move to jre1.6