Thanks again for your review!

Then, I attached another patch, which I hope it is what we need...

All the best,
Virgil.