Fix jdk 1.6 failure