HealthCheck fix