Fixed Initialization Issue