Fix generic.py provider broken with last updates