Attempt to fix charge continuing after re-spawn