Fix ControlBoardWrapper behaviour if the device name does not contain double dash