Follow up for Fix #8411