Make it work in 2.6