I'd replace the heater control valve also. I thought I had a heater core leak that turned out to be only the control valve. It's easy to replace and cheap.