Added additional sanitizing of the input