Thanks for your help! I think that makes a lot sense and it does fix the issue. In the end, I do pay more tax, but that is what I expected ...
Thank you!
