[Fix Bugs] For Deploy