Updated for Oracle JDK 1.7