Proper fix for empty contacts bug