FINAL py25/26 compat change!