checking for data source fixes #4