Oops! (Fix JDK 1.6 and JDK 1.7.)