fix contacts bugs