Don't try to bend existing design, just follow it. It's not nice, but is working. Just bring it back, then repeal and replace system as a whole, making sure every bit is working according to a design. Such quick patches only trying to make local sense of a system, defeating it's design.