[Fix]: Bug Fixs