I talked to the development team and they plan on making an update to handle receipts better in your situation.  I don't have any insight into when this will be completed at this time but will update when I know more.  

Thanks for pointing out this issue.