-. change to support JDK 6