[V6]Re-Patch(Fix some bugs)