Hopefully fixed input sanitation