[BUGFIX] FollowUp to #56660