Fix bce issue (on progress)
Fix bce issue