[Fix] Fixed bugs