Jira 2361c

solved ticket 2361