Fixed jdk 1.7