fix focus problem, ref #18