Bullets Manager fixed

Needs to be merged to the main branch.