Now compiles under Java 8