I like your approach @scottrippey more than the proposed solution.
I haven't seen the issue since I'm not so deep in this tool as you.