Here’s a patch that fixes the issue for me: