[BOUNTY CLAIM] Fix device misplacement #870

## Bounty Claim
**GitHub:** nikos1005
**Issue:** #870 - Device misplacement
### Analysis:
✅ Identified device handling issue
✅ Proposed fix for placement
**Claiming bounty.**