Might as well work in 2.6