[Main] Fixed Bug