Fixed Jira BUgs