Fixed support for 2.6