http://jira.aplana.com/browse/APLANATS-1344 bug fix