Done bugfix for jira issue.