fixes ZEN-13041
Merge pull request #35 from zenoss/feature/ZEN-13041

fixes ZEN-13041