Santization. Fixes #25