Also run on Java 8