Fixing generic provider