Fixed jira issue and fixed prevent issue