Fixup buggy commit 26a7afd