Fix BC issue (#6602)