Update for java6 compatible