Fix focus_new