fixed bug with service