Fix sanitizer
Merge pull request #135 from yakky/feature/sanitizer_2

Fix sanitizer