hopefully fix BC intergration NPE