Fixing issue for service facility