Make it work in 0.11.x