I came up with this change, which appears to fix the issue on my end: