better focus handling