Fixing a bug with multiple devices