manufacturer and service bugfix