@markstory That's a great idea. Very simple and solve the issue. I will adjust the PR tonight.