Servicetweak

fixes ITC-635.