Fixed problems with focus