Btw Jon Rimmer could you share your entity mappings so I can test my fix against your use case as well?