Fixing folder class detection