FIXING STANDARD HEATER PROBLEMS