Made compatible with Java 1.6