feature #1977: Fix Attach/Detach and PCI set functionality