[1358] Also replaces ' ' with '-'