Entity gets added multiple times.. Double-included?

Recent convert from Vera to HASS based Zwave. When I hit the Include button, I noticed that will “re-add” or “re-include” the same switch a second or third time.
Scenario:

  • include Switch A, let the inclusion timer expire
  • then include Switch B, expire
  • then hit include and turn on Switch A. --> now theres a NEW entity for this switch and the old one while still present, does nothing.

Solution: why should we be able to double-include the same node/device?

Am I missing something?