Fixed to allow spaces in names