Unrelated but not really worth a separate commit?