before fetch comment fix