Fix failure on 2.6