Make this work on 2.7