Fix providers problem after merge