fix 2.5-ism