fixed dataService problem

Not tested but should work