Made compatible with Java 1.7.6