Better sanitize values
keep return signature
Merge pull request #1834 from hissy/security-fix

Better sanitize values