fix bug(s) introduced with billing loop refactor