Can we fix this before the merge? It's a one-liner..