making sure spaces in the names also keep working