Fixed root cause of focus issue