Initialization fix