Fixed to java 1.7