fixes CC-394
Merge pull request #131 from zenoss/fix/CC-394-3

fixes CC-394