Fixed some BC break problem for sf 1.3