Would the attached workaround the issue?

Carlo