2.6 compatibility