Hej, yes, I think the same, I don't like to put bits of code like this to solve this kind of problems. I'll have a look at that and PR again if I find a good solution.

Tack!