Backadded the fix of Jira-228