Fix to work with 1.10.0