Made wait_for_change poll until the actual device is hit.