Fix #129 Changed field names are empty or undefined