same for V3 for #1753