2.6 compatibility fix