fixed DataService bug (issue #22)