Fix the initialization sequence