Fix issue with space in the name