Fix Initialization part