Add protection for overflow charge (ATLASSIM-5702)

This modification try to protect overflow of the charge.

This is for RUN3. It should not affect. CI test should pass.