I believe we actually have a fix for this already. I can provide you a link to a custom build if you'd like. Just send a message here or to me via DM on the community.
Matt Petty
Software Developer
SmarterTools Inc.
(877) 357-6278
www.smartertools.com