Resolved issues of new changes