Make it Java 6 compatible