Bug fix for self sanitizer