#235 Fix categories