Be a little nicer, don't need to double-test on jdk7