python3 compatibility
PR conflict