Can you apply this fix in another PR, please? It's unrelated and definitely useful.