Bug fix - categories