bring it up to work with v0.10