Update for Java7.