Sanitize bugfix