http://jira.aplana.com/browse/APLANATS-1682 fix