[c2928] Slightly improve [c2926]