fix initializing
Regression fixes