Adding compatability for Java 1.6