Fixed PREFERRED_PROVIDER stuff
fixed dependency