focus issue fixed