Fixed some issue.