Base: Fix issue adding new device