Fixed java 1.6 compability issue