Thanks a TON for this! I’ve searched a ton, and unfortunately this very prominent bug seems to be totally neglected.