another try to fix 2.6