Change to allow it to work on 2.6