make it work with 0.9.0-rc4