Fix bugs
Remove Copy and Paste issue.