correction in DataSource class