Why do you raise the status immediately on charging?
My buffalo took three shots, in 31 seconds to drop, without a charge and I found quite convenient to have extra rounds in mag for insurance shot (actually I made two insurance shots, just for the measure). So total 5 shots, without topping up.