fix: For prior PR #6749 (#6803)