Works on java 7 again