Fixed manager not firing on window change