Guava 18

Fix #637