Fix multi level nested fields getting marked as changed (#523)