Bugfix for DeviceTracker