Sanitize ALL the inputs
Fix merge conflict