If you don't want to fix it with this PR then feel free to raise a new JIRA