Data source bug fix