fixed stale data source issue