fixed TrackingService
something strange