Fix BSC refactor bug