Fixing a well-meaning but flawed guardian system

Fixes needed in well-meaning but flawed system