Hopefully fixed issue with connecting to devices on gateway