Fix for a little overly zealous security bug