Empty DataSource bug fix.