changed for fixing jira 2154