stuff for 2.6.x