fix cb2edac704 and b82f7050e4