fixed 2.6 support i think