fix issue where expired tokens might still commit a charge