Potential 2.6 support fix