Fix for JIRA 281

asd