Update for 2.6 compatibility