Finally fix the correct focus shift