fix bpa-accounting structure