Don't mess up spaces in names