fixed jdk1.7/1.6 issue in previous commit