fix #330 - extend sanitization