You're not alone :) The original code is quite confusing and most likely wrong in some cases, but I wanted to avoid this kind of behaviour in this PR. If you think the behaviour is different from the original code, that should be fixed in this PR.