attempt to add working support for 2.6