Initialization fixed