fix bug, working on improvements for BFT