Fixing issue with focus