Make it run on 0.9-rc11