fix FB in shvc
fix NPE