Fix exchange/connection fails by Romain-P