Fix regression in billing with #287