Fixed an issue where the devices where not allocating correctly or finding the right parent.