Fixed accidental merge of `scoped` branch