Changed to JVM 1.7 compat