add support for 2.6