Changed how the sanitize work