Fix issue for same-named devices