Serious security bug fix