Working on Java 7u71 support