Resolve focus issue