FIX BUG - data source