Made Java 6 compliant.