fix to device changes