Fixed issue raised in jira.