[Fixes #81493764] Correction code review