Fixed jdk7 compat