Fix/zen 12212

Fixes https://jira.zenoss.com/browse/ZEN-12212