Here's a patch that actually works (the first one caused some other issues which should be gone with this one).
Here's a patch that actually works (the first one caused some other issues which should be gone with this one).