Do some changes for resolving issue.