Made compliant with Java 1.7.