Fix to use any protocol