Move from OnInitialize to OnActivate (might have been too early)