Fix scoped vs all