focus issue fix