Fix problem with spaces