Thanks Petr, I actually did that at the end but I deleted the whole invalid surface and reconstructed it, joined everything and it is happy again.
Thanks Guys.

Cheers