Attempt to fix modem and bridge detection 2