Made 2.7.1 friendly