fix BC for #6890 and c91bd9be56e0b194beedde4c78be943591cdc719