Initialization bug partly fixed