Merge pull request #2254 from Sebmaster/fix-datasourceview