fixed issues that block when found the device