Fix for Jira 5