fix 2.5 compatibility