Jira 649 Fix