fix code for 2.5 compatibility