fixed support for 2.6