Fix based on 2to3