Fixed focus issue