fix of java8 vs Guava incompatiblity