Bugfix/contacts failures