moved the device fix logic to core
v1.2.3