Fixed #235.
Fixed the #233 fix.
Updated DefaultDataProviders list.