Fixed using wrong field names.