Make it Java 7 compliant