fixing JIRA bugs