Fixed BBB duplication on cycle change