Now able to compile under java 7