tried to fix 2.6 compatibility