Fix focus transition between phases