Fix regression: init after new was broken after re-org