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