Updated to work with Java 8 b109