Make it work with 2.6