merge hotfix: change 'field.' to 'field->'