Fixes a category handling issue for variants.

More...