fixed focus issue