I can confirm this simplified fix does fix the issue for me, ill promote this into our version control.