Contact list fix - attempt number 2