Fix for failing connections