replace computed BF with APF
fix NPE