Aligning with jdk7