Fix for categories