Fix to categories error
Merge conflict