Support 2.6 (attempt #2)