[Bug Fix] Return the correct data source class
Merge pull request #63 from kylef/bugs/critical

[Bug Fix] Return the correct data source class