fixed handling extract device change