fixed MS datasource and loader