Fix/contacts 2.0

Really? Maybe this is a bug...