Fix/2.6/billing triggers