fixed for names with spaces in them.