some bugs from jira
some bugs from jira