Solved focus bug