I've created an issue here:
Thanks @Anke for the images. I hope you don't mind that I used them in the issue.
@ewpatton what are your thoughts on the ideal way to fix the bug (I've attached three possible fixes in the issue). I'll see if I can find some time to work on this during the weekend.