[leslamarch]

Thanks for the great fix, I did limited testing and seems to work just as you intended