Fixed dead service issue