make it work with Java 8