Updated to work with 0.10.7.1