Fix typo introduced by merge