Changed answered to solved after merge that changed the field names