Fixing double sanitizing