As usual... I found new issue during repairs