Fixed the java 7 compability