fixed wrong field names