[Main] Fixed Major Bug