more sanitation, fixes issue #1