Moved the sanitation of  to where it should be