011- Prepare for bomb buttom bug fix