Thanks for the link. I've added the fallback and a comment that explains why we need it in the code. (Also added a test for this)