Fixed service problem