SPC-964 fix for categories