Fixed Device issue