Increase 2.6 compatibility