yep, as is always the case, it has to break before you can fix it. Bandaiding something along just makes it more painful for longer.