BUG: attempt at fixing 2.6 support.