This is the exact workaround we are using. Its a pain to have to do this so I hope a patch is forthcoming. It's also interesting that it didn't start happening when we last updated, but about 2-3 weeks after. And we've cut checks since the update without issues.