Fixed issue that association fields are missing from original data

In some rare cases the association fields can be missing from the original data. In order to fix that they are copied from the original entity.