Further sanatization.

Still not working.