Fixed problem with focus