Fix a security issue....