Fix strings with spaces