Fix for empty categories