AutoMapper & Bills bug fix