Focus bug solved