Hmm...nevermind, I was mistaken. That wouldn't solve this issue.

Your point is still relevant. I'll update it to handle this case.