DataService fix