Fix generic actions