JIRA-1965 layout fix