@HiperGlow
I could reproduce your issue, thanks again for reporting it.
The attached version should fix you up.
I tested the use case you specified on my dev machine and smoke tested it on my production HTPC.
Thanks
I will put them on the system - test them the next couple of days.