2.6 compatibility restored