Proper focus() fix