Now compiles with 1.7.0