fix focus problem v2