removed 2.6 compatibility