second fix for #15076