HealthX Bug fix