Welcome, @Kurt_Mylonas, and excellent workaround.
Related: This other workaround could be used in combination with your workaround!
Thanks,
Larry