More support for 2.6