just had the same problem with my baxi. it is the divertor valve. normally gets stuck due to dirt in the pipes. flush the system, repair or replace the diveror valve and then put inhibator in.
It cost me £115 for the part and sorted all the problem.
Steve Mann, November 2006