Fix issue with multiple content provider