Update: rewrite the same bugfix a bit better - More explicitly explained why it's needed Tests: none, trivial change