Refactor focus check
v1.3.3