now it works on non-java-8

hopefully